intial commit - mainly functioning, still some smaller issues