V0.9 commit, fully functional, just ugly as sin