Coming together a bit, still need work on the models