resolves #1, #2

@CommanderHamster
~requested 360
Proj 02: #1 
Proj 03: #2