Primairly design additions
cleaned up the code a bit