EDIT: Deciding to do a bit more work on it