Basic things now work correctly