Started adding functions, will work on it more tomorrow.