Lots more code added

If you are still following this please pull down the latest version