Basic stuff working, lots to do