Ass1 Final cleanup and UML update
Signed-off-by:Arie <arieclaassens@gmail.com>