Cleaned up code slightly, started on skellingtons!