Working, just need to fix that pesky button problem on the toolbar