finished refactoring (for now) ... and added aminalz!!