add a type annotation
Get basics working again and improve style