first commit got quite alot working already