Still working on things.. Just want to update the inprogress branch at least once this week :P