was too messy
not used to new syntax
Build 5