Finished basic functs - going to add small stuff