Cleaned up and gathered minimal API, commented out file inclusions that have not been completed yet