still workin' on it...

Some methods ported over, committing in case of tragic disaster
destroying all my local data.