Final pull request this time, i swear

Should actually have the Action Listener stuff added now.