Improved security
Cleaned up includes
A B-Tree and a simple db won't be bad, but there's a lot of work todo