#12 / #13 - Implemented major changes for final design