Fixed alot of bugs, completed initial structure