Added basic functionality that gets the job done; moe functionality to come later