Added a bit more program logic
STILL doesn't do anything (working on that)