Homework 4.0 as of pretty much done, just need to validate