Adding existing code
Some finishing touches