Fixed a bug, now a major part is working