Rad ass4

Merging final work into master.