Added a lot of shit. Should have commited before. Some frontend implementation and bugfixing