simplified alot, should have basic functionality now