Dirty Commit
Draw loop finally working