final build

Though there is still a lot that can be improved :P