WIP: Adding Profile handling functionas / Clean up of redundant files