More things working, still a few bugs left