Added some initial desing