Finished goal design. Working on js effects and refactoring models