Lots of fixes/additions, app is in a useable state now