added TODOs & added mockups