Initial commit
Basic map working
Some more style
merged