Add some basic functionality
code formatting