It's working. A few bugs, fixes incomming