Removed dummy elements
Finished building functionality