Added unit declaration for future compilation
Added things for testing. Attempted to modularize code, will rely on loading at the moment.