Working on improving the design!

view anyway