Formatting changes
Basic stuff works now