+ Implemented incremental goals, tested a little