Organizing code for future completion

Adding parameters and making IDE happy by removing any big errors.