Cleaned up
Fleshed out assignments