Almost there, still working with the killer UI
Merge with pull
Commit ng puyat pero pogi pa din