merge
Functions are starting to work