StartApp done
Refactors