Beginning fwlite refactor