In preparation for pull
Merged crap - please work
Merged MainActivity
Merged commits