Not quite, didn't have time to add in the former. The latter will have to be ommitted as a side mod though.
