Figured Id try and merge this before working on sqlite stuff. Let me know if theres anything you want changed.