General updates

Adding command arguments
Adding some TODOs