Removed old code.
Added new code and updated readme to match.