Lots of stuff added, some things are working, some are not