Working prototype 1

Everything works as intended, cosmetic and UI changes to come