Solved some problems, but not 100% ready yet
Basic working